From cc60347307c8e1922f5d2d069cb3c2affd16d9b7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 16 Aug 2022 08:23:51 +0100 Subject: [PATCH] d/rules: Enable broadway backend for the .deb build (but not the udeb) This is apparently used by Cambalache and Deckard, and also the Pidgin unit tests. Closes: #994944 --- debian/libgtk-4-1.symbols.in | 11 +++++++++++ debian/libgtk-4-bin.install | 2 ++ debian/rules | 3 +-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/libgtk-4-1.symbols.in b/debian/libgtk-4-1.symbols.in index d0b18fe9d8..ef39a34794 100644 --- a/debian/libgtk-4-1.symbols.in +++ b/debian/libgtk-4-1.symbols.in @@ -10,6 +10,15 @@ libgtk-@APIVER@.so.@SONAME@ @SHARED_PKG@ #MINVER# gdk_app_launch_context_set_timestamp@Base 4.0.0 gdk_axis_flags_get_type@Base 4.0.0 gdk_axis_use_get_type@Base 4.0.0 + gdk_broadway_cairo_context_get_type@Base 4.7.2+ds-1~ + gdk_broadway_display_get_surface_scale@Base 4.7.2+ds-1~ + gdk_broadway_display_get_type@Base 4.7.2+ds-1~ + gdk_broadway_display_hide_keyboard@Base 4.7.2+ds-1~ + gdk_broadway_display_set_surface_scale@Base 4.7.2+ds-1~ + gdk_broadway_display_show_keyboard@Base 4.7.2+ds-1~ + gdk_broadway_draw_context_get_type@Base 4.7.2+ds-1~ + gdk_broadway_monitor_get_type@Base 4.7.2+ds-1~ + gdk_broadway_surface_get_type@Base 4.7.2+ds-1~ gdk_button_event_get_button@Base 4.0.0 gdk_button_event_get_type@Base 4.0.0 gdk_cairo_context_cairo_create@Base 4.0.0 @@ -637,6 +646,8 @@ libgtk-@APIVER@.so.@SONAME@ @SHARED_PKG@ #MINVER# gsk_border_node_get_type@Base 4.0.0 gsk_border_node_get_widths@Base 4.0.0 gsk_border_node_new@Base 4.0.0 + gsk_broadway_renderer_get_type@Base 4.7.2+ds-1~ + gsk_broadway_renderer_new@Base 4.7.2+ds-1~ gsk_cairo_node_get_draw_context@Base 4.0.0 gsk_cairo_node_get_surface@Base 4.0.0 gsk_cairo_node_get_type@Base 4.0.0 diff --git a/debian/libgtk-4-bin.install b/debian/libgtk-4-bin.install index bca95555d1..641d1d63d7 100644 --- a/debian/libgtk-4-bin.install +++ b/debian/libgtk-4-bin.install @@ -1,9 +1,11 @@ +usr/bin/gtk4-broadwayd usr/bin/gtk4-builder-tool usr/bin/gtk4-encode-symbolic-svg usr/bin/gtk4-launch usr/bin/gtk4-query-settings usr/bin/gtk4-update-icon-cache usr/share/man/*/gtk4-encode-symbolic-svg.* +usr/share/man/man1/gtk4-broadwayd.1 usr/share/man/man1/gtk4-builder-tool.1 usr/share/man/man1/gtk4-launch.1 usr/share/man/man1/gtk4-query-settings.1 diff --git a/debian/rules b/debian/rules index f962532725..0e329a5439 100755 --- a/debian/rules +++ b/debian/rules @@ -81,7 +81,7 @@ configure_flags_common = \ configure_flags_deb = \ -Dauto_features=enabled \ - -Dbroadway-backend=false \ + -Dbroadway-backend=true \ -Dx11-backend=true \ ${NULL} @@ -286,7 +286,6 @@ override_dh_install: rm -fv debian/install/udeb/usr/bin/gtk4-update-icon-cache rm -frv debian/install/udeb/usr/share/gtk-4.0/valgrind rm -frv debian/install/udeb/usr/share/metainfo - rm -fv debian/install/deb/usr/share/man/man1/gtk4-broadwayd.1 : dh_install -p$(UDEB_PKG) --sourcedir=debian/install/udeb dh_install --remaining-packages --sourcedir=debian/install/deb -- 2.30.2